sunxi: Use Kconfig CONFIG_MMC

Not all sunxi boards have an MMC embedded. Switching to the Kconfig option
will allow to enable or disable the support in each boards' defconfig.

Signed-off-by: Maxime Ripard <[email protected]>
Reviewed-by: Hans de Goede <[email protected]>
Signed-off-by: Hans de Goede <[email protected]>

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index b3367779af9b023243f7767589b5cae8cfdff6d5..f6f2a605eca32b16e12b4b110cb4e8ca80ec19f4 100644 (file)
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -227,6 +227,10 @@ config OLD_SUNXI_KERNEL_COMPAT
        Set this to enable various workarounds for old kernels, this results in
        sub-optimal settings for newer kernels, only enable if needed.
 
+config MMC
+       depends on !UART0_PORT_F
+       default y if ARCH_SUNXI
+
 config MMC0_CD_PIN
        string "Card detect pin for mmc0"
        default ""

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index d3d7d911e4846f465c4d91090822078c0ab18f7e..ceae7bcaec6a5e3b562348b6bb8ddc2931210233 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -2,7 +2,7 @@ menu "MMC Host controller Support"
 
 config MMC
        bool "Enable MMC support"
-       depends on UNUSED
+       depends on ARCH_SUNXI
        help
          TODO: Move all architectures to use this option
 

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 072934d151c30646c0ddb96c0f3eb01f2064ab7e..ddcfe94e89e7568e2642c56644729c0932b8c7b6 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -140,8 +140,7 @@
 #endif
 
 /* mmc config */
-#if !defined(CONFIG_UART0_PORT_F)
-#define CONFIG_MMC
+#ifdef CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_CMD_MMC
 #define CONFIG_MMC_SUNXI
@@ -197,7 +196,7 @@
 
 #define CONFIG_SPL_LIBDISK_SUPPORT
 
-#if !defined(CONFIG_UART0_PORT_F)
+#ifdef CONFIG_MMC
 #define CONFIG_SPL_MMC_SUPPORT
 #endif
 
@@ -355,9 +354,12 @@ extern int soft_i2c_gpio_scl;
 #define CONFIG_ANDROID_BOOT_IMAGE
 
 #define CONFIG_FASTBOOT_FLASH
+
+#ifdef CONFIG_MMC
 #define CONFIG_FASTBOOT_FLASH_MMC_DEV  0
 #define CONFIG_EFI_PARTITION
 #endif
+#endif
 
 #ifdef CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_CMD_USB_MASS_STORAGE